Ignore invalid base64 encoded embedded images

* lisp/net/shr.el (shr-image-from-data): Ignore invalid base64
encoded embedded images (bug#22928).
(cherry picked from commit f2da80d0e1ccd121c4891e869a45aeb9c6b1795d)

Backport:

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 900b8ec3f5cf393e0b02127bf313b8fb07c3c0bf..07fcbebce087c133fd8c2cbaf2fb255ad7c98444 100644 (file)
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -924,7 +924,8 @@ If EXTERNAL, browse the URL using `shr-external-browser'."
     (let ((param (match-string 4 data))
          (payload (url-unhex-string (match-string 5 data))))
       (when (string-match "^.*\\(;[ \t]*base64\\)$" param)
-       (setq payload (base64-decode-string payload)))
+       (setq payload (ignore-errors
+                        (base64-decode-string payload))))
       payload)))
 
 ;; Behind display-graphic-p test.